fix driveside detection of files in conflicting overrides check#495
Merged
Conversation
This removes a lot of `conflicting-overrides` tags that were erroneously added due to incorrect distinction between RHD/LHD files.
Found 93436 conflicting RUL2 overrides (removed 3423, added 90).
The changes almost exclusively affect RHD files. The RHD files came alphabetically after the LHD, so previously the RHD rules would be marked as conflicting.
Some exceptions:
- driveside-independent files: some rules are newly conflicting with RHD rules (previously those RHD rules had been "conflicting" with LHD rules). Usually, these rules are copies of LHD rules, which explains the conflict.
- 2 LHD files are affected: in both cases, the affected rules are also contained in RHD files that are loaded earlier.
All in all, the changes look plausible.
This adds `conflicting-override-rhd` or `conflicting-override-lhd` tags when a driveside-independent rule conflicts with just RHD or LHD rules.
The correct rules are copied from the following files, which seem to
duplicate some of these rules:
Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt
Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt
…flicts) The previous conflicts are now duplicates only.
11 tasks
Member
|
Thanks for the fix. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The conflicting overrides checker from #494 didn't correctly identify LHD and RHD files. Effectively, all files were treated as driveside-independent, leading to incorrect "conflicts" between RHD and LHD files. This PR fixes that.
This removes a lot of
conflicting-overridetags that were erroneously added due to incorrect distinction between RHD/LHD files.The changes almost exclusively affect RHD files. The RHD files came alphabetically after the LHD, so previously the RHD rules would be marked as conflicting.
Additionally, this PR fixes all driveside-independent rules that are conflicting in RHD but not in LHD or vice versa. These would be tagged by
conflicting-override_rhdorconflicting-override_lhd. Introducing new conflicts of this type to the repository should be avoided, as it means the driveside-independent rules aren't actually driveside-independent but only have an effect for one of the drivesides.